Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate with Osmosis for shielded swaps #4133

Merged
merged 31 commits into from
Jan 20, 2025
Merged

Conversation

sug0
Copy link
Collaborator

@sug0 sug0 commented Dec 2, 2024

Describe your changes

Based on #4134

  • Implement SDK/CLI code to perform shielded swaps.
  • Integrate with the overflow receive middleware, to support directly shielding the minimum output amount of a trade on Osmosis, and sending the diff to a transient account.

Diff: https://github.com/anoma/namada/compare/bat+tiago/feat/ibc-pfm-with-invalid-addrs..tiago/osmosis-swap-cli-over-v44

Checklist before merging

  • If this PR has some consensus breaking changes, I added the corresponding breaking:: labels
    • This will require 2 reviewers to approve the changes
  • If this PR requires changes to the docs or specs, a corresponding PR is opened in the namada-docs repo
    • Relevant PR if applies: (TODO, currently the new functionality is undocumented)
  • If this PR affects services such as namada-indexer or namada-masp-indexer, a corresponding PR is opened in that repo
    • Relevant PR if applies:

Copy link

codecov bot commented Dec 2, 2024

Codecov Report

Attention: Patch coverage is 18.34862% with 801 lines in your changes missing coverage. Please review.

Project coverage is 74.08%. Comparing base (867e20d) to head (1d5de2c).
Report is 33 commits behind head on main.

Files with missing lines Patch % Lines
crates/sdk/src/rpc.rs 0.00% 268 Missing ⚠️
crates/sdk/src/args.rs 0.00% 193 Missing ⚠️
crates/ibc/src/context/middlewares/pfm_mod.rs 16.90% 172 Missing ⚠️
...rates/ibc/src/context/middlewares/shielded_recv.rs 22.85% 81 Missing ⚠️
crates/ibc/src/msg.rs 21.56% 40 Missing ⚠️
crates/sdk/src/tx.rs 0.00% 21 Missing ⚠️
crates/ibc/src/context/token_transfer.rs 63.63% 8 Missing ⚠️
crates/core/src/address.rs 40.00% 6 Missing ⚠️
crates/core/src/token.rs 0.00% 6 Missing ⚠️
crates/ibc/src/context/nft_transfer_mod.rs 33.33% 2 Missing ⚠️
... and 2 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4133      +/-   ##
==========================================
- Coverage   74.59%   74.08%   -0.51%     
==========================================
  Files         342      345       +3     
  Lines      108796   109721     +925     
==========================================
+ Hits        81152    81290     +138     
- Misses      27644    28431     +787     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sug0 sug0 changed the title Susmosis... Implement Osmosis shielded swaps Dec 2, 2024
@sug0 sug0 force-pushed the tiago/osmosis-swap-cli-over-v44 branch from 64e7e47 to 6fa153d Compare December 2, 2024 16:19
@sug0 sug0 force-pushed the tiago/osmosis-swap-cli-over-v44 branch from 6fa153d to 59b6d2b Compare December 2, 2024 16:32
sug0 added a commit that referenced this pull request Dec 2, 2024
@sug0 sug0 marked this pull request as draft December 2, 2024 16:34
@sug0 sug0 force-pushed the tiago/osmosis-swap-cli-over-v44 branch from 7c4a50d to 8ba3663 Compare December 6, 2024 11:17
@sug0 sug0 marked this pull request as ready for review December 10, 2024 13:58
@sug0 sug0 changed the title Implement Osmosis shielded swaps [draft] Implement Osmosis shielded swaps Dec 10, 2024
@sug0
Copy link
Collaborator Author

sug0 commented Dec 11, 2024

TODO add new e2e tests to CI

@sug0 sug0 force-pushed the tiago/osmosis-swap-cli-over-v44 branch 2 times, most recently from ac598c3 to 370ce50 Compare December 18, 2024 15:11
@sug0
Copy link
Collaborator Author

sug0 commented Dec 18, 2024

TODO: add a changelog. done in 5ecd557

this check is passing in CI, but only because we are checking the entries from the base PRs

@sug0 sug0 force-pushed the tiago/osmosis-swap-cli-over-v44 branch 2 times, most recently from 19bce63 to 037d931 Compare December 19, 2024 13:22
@sug0 sug0 mentioned this pull request Dec 19, 2024
@batconjurer batconjurer force-pushed the tiago/osmosis-swap-cli-over-v44 branch from 3201926 to a4bdd73 Compare December 27, 2024 14:35
@sug0 sug0 force-pushed the tiago/osmosis-swap-cli-over-v44 branch from 1641e8a to e0be6e0 Compare January 13, 2025 13:26
@sug0 sug0 marked this pull request as draft January 13, 2025 13:34
@sug0 sug0 changed the title [draft] Implement Osmosis shielded swaps Implement Osmosis shielded swaps Jan 13, 2025
@sug0 sug0 changed the title Implement Osmosis shielded swaps Osmosis integration for shielded swaps Jan 13, 2025
@sug0 sug0 changed the title Osmosis integration for shielded swaps Integraet with Osmosis for shielded swaps Jan 13, 2025
@sug0 sug0 changed the title Integraet with Osmosis for shielded swaps Integrate with Osmosis for shielded swaps Jan 13, 2025
sug0 and others added 19 commits January 20, 2025 15:25
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
Co-authored-by: Jacob Turner <jacob.turner870@gmail.com>
@tzemanovic tzemanovic force-pushed the tiago/osmosis-swap-cli-over-v44 branch from 96e1039 to 1d5de2c Compare January 20, 2025 15:39
@tzemanovic tzemanovic added the merge Ready to merge - mergifyio bot will add the PR to merge queue when all checks pass label Jan 20, 2025
mergify bot added a commit that referenced this pull request Jan 20, 2025
@mergify mergify bot merged commit 90771ba into main Jan 20, 2025
23 of 25 checks passed
@mergify mergify bot deleted the tiago/osmosis-swap-cli-over-v44 branch January 20, 2025 17:01
tzemanovic added a commit that referenced this pull request Jan 21, 2025
…er-v44"

This reverts commit 90771ba, reversing
changes made to 04b81b1.
tzemanovic added a commit that referenced this pull request Jan 21, 2025
* tomas/rev-osmosis:
  Revert "Merge pull request #4133 from anoma/tiago/osmosis-swap-cli-over-v44"
tzemanovic pushed a commit that referenced this pull request Jan 21, 2025
tzemanovic added a commit that referenced this pull request Jan 21, 2025
* tiago/osmosis-swap-cli-over-v44-2:
  Changelog for #4133
  Improve Osmosis swaps CLI help msgs
  Generate disposable overflow receivers
  Expose SDK function to gen disposable signing keys
  Add Osmosis XCS e2e test
  Add Osmosis contract bytecode fixtures
  Add shielded recv e2e tests
  Accept shielded recv IBC memos in e2e tests
  Expose Osmosis swaps via CLI
  Avoid full gen IBC shielding args clone
  Implement Osmosis swap SDK functionality
  Implement shielded recv IBC middleware
  Add new Osmosis related IBC memos
  Redenominate amounts
  Convert from address to signer
  Fix IBC verifiers inclusion
  Refactor PFM module impl
  Update IBC middleware stack
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking: protocol breaking: tx cli IBC MASP merge Ready to merge - mergifyio bot will add the PR to merge queue when all checks pass SDK
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants